util: Move wiggle parameters to a common place

Since the wiggle effect will be used by the redesigned prompt-dialogs
and we always want to use the same parameters, move those as defaults
for the wiggle function to the util.js file.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/942

diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index ac42c2c9604577b9f00cced83fbc7714013e6056..4c0f8d23fae48993901b91d4ef2d2edf1b374255 100644 (file)
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -17,10 +17,6 @@ var DEFAULT_BUTTON_WELL_ANIMATION_TIME = 300;
 
 var MESSAGE_FADE_OUT_ANIMATION_TIME = 500;
 
-const WIGGLE_OFFSET = 6;
-const WIGGLE_DURATION = 65;
-const N_WIGGLES = 3;
-
 var AuthPromptMode = {
     UNLOCK_ONLY: 0,
     UNLOCK_OR_LOG_IN: 1,
@@ -282,11 +278,7 @@ var AuthPrompt = GObject.registerClass({
         this.setActorInDefaultButtonWell(null);
         this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
 
-        Util.wiggle(this._entry, {
-            offset: WIGGLE_OFFSET,
-            duration: WIGGLE_DURATION,
-            wiggleCount: N_WIGGLES,
-        });
+        Util.wiggle(this._entry);
     }
 
     _onVerificationComplete() {

diff --git a/js/misc/util.js b/js/misc/util.js
index f143c9151eab14ca54c989c2b6b4abf4ee3728a3..a58ebc5e8145d6d2148e3661f635951a3348a45b 100644 (file)
--- a/js/misc/util.js
+++ b/js/misc/util.js
@@ -11,6 +11,10 @@ const Params = imports.misc.params;
 
 var SCROLL_TIME = 100;
 
+const WIGGLE_OFFSET = 6;
+const WIGGLE_DURATION = 65;
+const N_WIGGLES = 3;
+
 // http://daringfireball.net/2010/07/improved_regex_for_matching_urls
 const _balancedParens = '\\([^\\s()<>]+\\)';
 const _leadingJunk = '[\\s`(\\[{\'\\"<\u00AB\u201C\u2018]';
@@ -442,9 +446,9 @@ function ensureActorVisibleInScrollView(scrollView, actor) {
 
 function wiggle(actor, params) {
     params = Params.parse(params, {
-        offset: 0,
-        duration: 0,
-        wiggleCount: 0,
+        offset: WIGGLE_OFFSET,
+        duration: WIGGLE_DURATION,
+        wiggleCount: N_WIGGLES,
     });
     actor.translation_x = 0;